Rename libgtk_only symbol in GdkWaylandToplevel

All public non-exported symbols in GDK can be used by GTK.

diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c
index bb78d49730995def3edaf226cf6fb1e28601fe62..ba5abff7508db3c0899d5a1cecee4f535b14a8bc 100644 (file)
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -4168,13 +4168,13 @@ maybe_set_gtk_surface_dbus_properties (GdkWaylandSurface *impl)
 }
 
 void
-gdk_wayland_toplevel_set_dbus_properties_libgtk_only (GdkToplevel *toplevel,
-                                                      const char  *application_id,
-                                                      const char  *app_menu_path,
-                                                      const char  *menubar_path,
-                                                      const char  *window_object_path,
-                                                      const char  *application_object_path,
-                                                      const char *unique_bus_name)
+gdk_wayland_toplevel_set_dbus_properties (GdkToplevel *toplevel,
+                                          const char  *application_id,
+                                          const char  *app_menu_path,
+                                          const char  *menubar_path,
+                                          const char  *window_object_path,
+                                          const char  *application_object_path,
+                                          const char *unique_bus_name)
 {
   GdkWaylandSurface *impl;
 

diff --git a/gdk/wayland/gdksurface-wayland.h b/gdk/wayland/gdksurface-wayland.h
index 1ca3877a46f5d59ce11799fd9b279c7100fec41e..b0d0d6fc1960a83444382a956423011794a26bd5 100644 (file)
--- a/gdk/wayland/gdksurface-wayland.h
+++ b/gdk/wayland/gdksurface-wayland.h
@@ -24,17 +24,17 @@
 
 G_BEGIN_DECLS
 
-void                     gdk_wayland_toplevel_set_dbus_properties_libgtk_only (GdkToplevel *toplevel,
-                                                                               const char  *application_id,
-                                                                               const char  *app_menu_path,
-                                                                               const char  *menubar_path,
-                                                                               const char  *window_object_path,
-                                                                               const char  *application_object_path,
-                                                                               const char  *unique_bus_name);
+void                     gdk_wayland_toplevel_set_dbus_properties       (GdkToplevel *toplevel,
+                                                                         const char  *application_id,
+                                                                         const char  *app_menu_path,
+                                                                         const char  *menubar_path,
+                                                                         const char  *window_object_path,
+                                                                         const char  *application_object_path,
+                                                                         const char  *unique_bus_name);
 
-void                     gdk_wayland_toplevel_announce_csd       (GdkToplevel *toplevel);
+void                     gdk_wayland_toplevel_announce_csd              (GdkToplevel *toplevel);
 
-gboolean                 gdk_wayland_toplevel_inhibit_idle       (GdkToplevel *toplevel);
-void                     gdk_wayland_toplevel_uninhibit_idle     (GdkToplevel *toplevel);
+gboolean                 gdk_wayland_toplevel_inhibit_idle              (GdkToplevel *toplevel);
+void                     gdk_wayland_toplevel_uninhibit_idle            (GdkToplevel *toplevel);
 
 G_END_DECLS

diff --git a/gtk/gtkapplication-wayland.c b/gtk/gtkapplication-wayland.c
index a892f4be4ba3642b32dcec10b8592e5664590d30..76fa144751862bf7f43a555ceb0d37c431078053 100644 (file)
--- a/gtk/gtkapplication-wayland.c
+++ b/gtk/gtkapplication-wayland.c
@@ -84,9 +84,13 @@ gtk_application_impl_wayland_handle_window_realize (GtkApplicationImpl *impl,
 
   window_path = gtk_application_impl_dbus_get_window_path (dbus, window);
 
-  gdk_wayland_toplevel_set_dbus_properties_libgtk_only (GDK_TOPLEVEL (gdk_surface),
-                                                        dbus->application_id, dbus->app_menu_path, dbus->menubar_path,
-                                                        window_path, dbus->object_path, dbus->unique_name);
+  gdk_wayland_toplevel_set_dbus_properties (GDK_TOPLEVEL (gdk_surface),
+                                            dbus->application_id,
+                                            dbus->app_menu_path,
+                                            dbus->menubar_path,
+                                            window_path,
+                                            dbus->object_path,
+                                            dbus->unique_name);
 
   g_free (window_path);